Made today view elements white
Merge branch 'dev/Layout' into develop