Template overhaul
Layout upgrades