Change Button Layout on App Media Selection

I am frequently confused when selecting how I am going to upload a photo or sound for an observation from the android app. This is because “Choose Sound” is under “Take Photo” instead of “Choose Image” (the opposite being true for “Record Sound”). Every language I have learned reads vertically instead of diagonally so it makes sense to my brain that these choices should be aligned vertically.

This is mostly applicable when adding media to an observation that already exists:

Here is what it looks like when uploading a new observation:

I might also suggest that “No Media” is more fitting than “No Photo” as observations with just sounds also have no photo.