Small bug fixes with layout etc