Changed adorner to use geometry