Changed the jsystem model and changed a few layouts