small bug fixes and UI cleanups