cleaned up filtering
improved the way our alerts and notices look when some clicks on the button favorite
fixed merge conflicts
Merge pull request #82 from tanmdoan/improving-filtering

Improving filtering