more work on the new layout