More work on overall layout