Font awesome and clean up