js/css fix for firefox
Merge branch 'dev'