Adjustments to UI and bugfixes