layout improvements
small layout improvements