Finished more portions of the layout