Styling change for auto position.
Merge remote-tracking branch 'origin/master'