Work on drawing and view management