New layout

Better params. Multiple configs/services.