Minor changes due to responsive problems.
Merge remote-tracking branch 'origin'