Fix a few small layout issues