Refactored for HMVC views and template fallbacks