ui changes and bug fixes
Merge pull request #1 from erikmontes/master

ui changes and bug fixes