Finished up search
Merge branch 'production' of github.com:ShaastraWebops/frontend into production
Added back button and new event