Refactored Adorner and behavior for better responsibility assignment