Refactor
Add fontawesome