updated layout. 80% of layout completed