major design layout changes not finished yet