Many fixes and UI improvements