More work on the layout view