Amongst other things refactored CMS into Dashboard where necessary
Also worked through more of Bozzons comments