Add some UI improvements