Updated full layout, scrapping old design.