Imported MainActivity.java into app

Also some minor changes to main layout design