Update layout
Added main controller to template
Update template manager
Added journal and search to layout