Fixed some bugs. 
Reorganized the simulation canvas.