Current state after fiddeling around with the mapping.
First attempt to modularize the layout.