use more space, fix layout