Easyness of Wellness Data Input

For some Wellness Data like Stress or Mood (the original ones, I guess?), there is a convenient one-click button available to set them up. For other ones, like Alcohol, one has to go into a drop-down menu.

Could all Select metrics be added to these one-click button bars? Of course, because the number of options is not always four, there could be some UI issues…

Also, is there a way to sort these fields for the input? It would be nice to split between autofilled ones and manually-filled ones. And also to have them sorted in the calendar view.

My Public Input Fields on my Profile Page are also not sorted nicely.