changes

changes

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
CSS

CSS changes

Signed-off-by: Joshua Pekera <joshuapekera@me.com>
Merge branch 'release/2.5'