Finish annotation markup, fix zoom throwing out the coordinate calcs
Use constants for points