Working on UI stuff
Local UI changes added, nothing major yet.
Merge branch 'master' into NateUI
Lots of UI changes and some bugs.
Merged from master.
Fixed  some display bugs
Merge pull request #56 from cameronklein/NateUI

Nate ui