Bugfixes and improvements to UI