Fixed canvas bug, moved check in button
Merge branch 'dev' of https://github.com/oSoc13/Cityroute into dev