Minor updates
Updated stuff with fontawesome
Merge branch 'develop'