added catalog and style
added layout
fixed broken tests (late)