UberFire tutorial on new template structure (some cleanups)