small layout changes
Merge branch 'AndiPatch'