Small fixes to UI and improved visuals