some small improvements for layout