User Interface and performance improvements