Fix z-index issue on dropdowns [MJ-760]

Adding any kind of z-index to both of these makes them not pop behind various form components, as displayed in the ticket.

All tests pass.