Updated config & layouts

Updated config & layouts
Merge pull request #8 from miguelfito/master

Updated config & layouts