Fixed a few usability bugs