Buttons are now grouped
Country details / form are tabbed again
City details / form are tabbed again