Merge branch 'addProjDataDef'
Merge branch 'addProjDataDef'
UI bug fixes
adding missing padding
some changes in the layout to add a more common page structure
Merge branch 'master' into addProjDataDef
fixed bug in previous layout change
Merge branch 'master' into addProjDataDef