Updated the main activity to follow current GUI layout