searchbox added
Merge branch 'master' of https://github.com/zemadi/CycleSafe_deploy

Merged with Ghaida's changes and added more edits.