Remove fa include, style tweaks.