more gui updates: organize and clean up the code for simulator layout.