More UI changes
Final except deletion