some fixes and UI changes