Updated view and functions
"commit before merging"
Merge branch 'newDesign'