Started major rewrite of the default layout - wip