Layout cleanup

Few changes to activity_main.xml regarding the layout