New layout. Fixed a crash bug in gpssim