Update for Layouts

The Layout system called for a double set of layouts.
One for one engine boats (layout prepended with a 1) and for two engine
boats (layout prepended with a 2).
Layouts without a prepended number are not used anymore.

Also the code needed some minor updates to handle these numbered
layouts.