Cleand up some UI