SOS-1886 Fix nav-account-controls misalignment across various views