Fixed some bugs in layout and update the simulation