[BUGFIX] Cruise Layout