Fix a few layout mistakes