Bugfixes and UI tweaks