Styling fixes for FF. Also fixes #245