More fixing to the UI