Updated almost all the layout and front end