More cleanup of UI