updated config files
major layout changes
Merge branch 'issue-1' into develop