updated layout of all views
resolved merge issue
Merge branch 'master' of github.com:solutionsresourceinc/procurementTrackingSystem