Moved much of view to new main layout so less is needed in module views.