Some updates on the UI