Code cleanup
Working on dragging frame around
changed touch mechanism