Added font awesome
Cleaned up naming conventions