Add visual feedback and other tweaks