Improve layout slightly