Updated stuff with fontawesome