Added two buttons to main screen and application class
Merge branch 'feature/20130324_main_page_layout'