updated alerts styles
Merge branch 'test' into prod