[#189] Fix smallish UI issues