many ui changes and performance improvements