Edits for work page
Merge branch 'master' into workpage
still working on this
Merge branch 'master' into workpage
Work page resize capabilities
tMerge branch 'workpage'