More FF button fixes, modernize.