Change upsert to separate update/insert
Flavour wheel
Integrate flavourwheel, set editing mode on form, some other stuff