layout changes; some small improvements