Improve HMVC calls and add more layouts