small improvements in layout