layout tweaks (wrapping)
Merge remote-tracking branch 'origin/master'