Rework toolbar layout so it's consistent with other pages