continued work on layout and content