Get the new layouts working
Remove base.html (not needed)