A few minor bugfixes/UI tweaks