Fixed most of UpdateDrawLocation()

- Fixed most of UpdateDrawLocation.  Haven't made sense of it all yet.
Background color is still commented out.