font awesome, minor changes
fix merge