Initial commit for final UI changes
Merge pull request #7 from lnanek/alec/final-ui-changes

Initial commit for final UI changes