UI tweak & polish