Updated some of the layout