PAHMA-979: minor rearrangement of the page and dropdowns