UI improvements, small bug fixes.