fixed some UI bugs and optimized a couple of things
Merge pull request #13 from danielbaldonado/bugandui_fixes

fixed some UI bugs and optimized a couple of things