Update layout to new templates, removing a lot of stuff