Working on the layout of the app