major speed improvement
UI improvements