Refactored visual feedback