Continued work on layout