Skip to content

Tidy draw logic

Tidy draw logic #37