Fixed a few layout issues