some refactor
Revert "some refactor"

This reverts commit ef3ac29d03519dd735fba5eef02b0570044e0d95.
refactored
css, images
Merge remote-tracking branch 'origin/correlation' into fixes
colors
merge with master
some unexpected changes were detected and resolved