Updated the version of font-awesome to 4.1.
Rearranged the css files.