Fix a few bugs for tablet (two pane) devices