More work on layout and design