Added invalidate, changed drawing area