Better selectors and vertical navigation naming