More ui updates
UI updates