Refactor visuals

... gotta get it in better order for the tutorial!