General improvements and UI changes