Updated version, with tabs all being templates