Short circuited the home screen, added swap button and a nifty title bar