Category form search bar implemented
merge conflicts resolved