Cleanup and added basic canvas'