May 17

Fixed some issues with draw order and canvas size