Synching properly

Accidentally created drawing comflicts between GUI and Viewport. They
should be gone now.