Further improve tablet nav behavior