Added custom template tags, cleaned up code
Standardized names/labels for tabs/sections