Fix a few layout issues