fixed browser compatibility for styles
Merge remote-tracking branch 'origin/dev' into dev