Fixed some nagging UI bugs
Merge pull request #57 from cameronklein/NateUI

Fixed some nagging UI bugs