Add font awesome icons
Improve search