Bugfixes and UI Changes