Made today view elements white
Merge branch 'dev/Layout' into develop
Merge remote-tracking branch 'origin/develop' into dev/Stepper