Bring back the UI with some minor improvements