Renamed dockTop to dock.top
Cleaned the workspace template.xhtml so that it only changes what is
different in relation to default.xhtml
Workspace testing and tuning