Updated the templates and views to allow for Layout manager.