Fixed bug with active state
Template standards tweaks