more UI tweaks -a