fixing grid display bug in firefox
Merge branch 'master' into persona