improve layout a bit