UI adjustments and polishing