Merge pull request #4 from mitchross/refactorwork-cakewalker

Fixed Layout issues
Changed the styling of the login screen
Changed the styling of the login screen
Better handling of get Intent Extra