Layout changes and fixes
Merge branch 'tanveer_1.9' into umair_newui

Conflicts:
	apps/bridgemail/campaign.js
	apps/bridgemail/campaigns.js