Remove contructor parameters
Add layout blocks
Separate config file