Update some UI and add new features