Fixed some UI amongst other stuff