CSS Fixes
Merge branch 'tanveer_n_1.18' into contacts-dashboard
Template Page changes