Fix a few errors with layout etc