Refactor and add font-awesome