Modify design of main activity - #7