Switched to a new layout template; updated all files accordingly