Some design changes according to new .psd
Merge remote-tracking branch 'origin/master'