Changed minor designs
Merge remote-tracking branch 'origin/master'
Changed minor designs