Minor UI tweaks. Close #90