updated config settings
adding resouces, some layout work
Merge branch 'master' into kj-bee-ranch