Switched to templated layout