FIxed some templates and added a search controller