Moving the layout into the app folder and adjusting in order for it to work