Properly handle drawer state per-session, highlight drawer tab buttons