More cleanup of sidebar nav