UI tweaks - fixing issue with unassign