working on layout. WIP