Minor UI tweaks, minor logic bugfixes