css changes and more
more css changes
Merge branch 'refactor/multi-hotfixes' into develop
merging