Refactored charts
Updated template handlers
Added subscribe popup