rework some UI elements