Merge branch 'hotfix/add_config'
css updates
Merge branch 'hotfix/css_updates' into develop