Minor UI adjustments and small bug fixes.