FR corrections and additions.

Cut down FR entries to fit the interface.
http://i.gyazo.com/72c909e805fe06877cd3b56e22752180.png

Added missing entries.
Manually merged #1016