Typeahead by category, form style fixes, comments added to users
merge conflict fix