Layout now configurable