Some menu theming and imported config to styles
Merge branch '7.x-1.x' of github.com:bfr/drupalfi into 7.x-1.x