Getting ready to edit. Enhanced diplay logic and events.