Firefox fixes
Merge pull request #257 from CosmoCMS/James

Firefox fixes