Changes to look-mode drawing

Fixes #553