Added selection of categories and populated fields on frontend