Change vertical line code & watch width / height changes
Additional watchers & re-add y-axis
Little refactor & y-axis tweak