Merge category add/edit to single form