Cleaned up a few messed layouts