Modified button size and made  few other adjustments.
Merge remote-tracking branch 'origin/master'