Updated config & default layout

Updated config & default layout
Merge pull request #7 from miguelfito/master

Updated config & default layout