Completed all the layout, just need to add some more logic