Added category optgroups in form, improved category scraping