Fix them bugs on the UI.