Closes #8
UI tweaks and improvements