UI changes to focus on performance
Merged master into nicefy