Merge pull request #2163 from bhousel/bhousel-presets

Various updates to presets
Fix tag reference layout on FF (fixes #2159)