Fixed some stuff and added more new layout.