ticket:2 Change layout and logic of the main activity