Update layout, small improvements.