settings and history reshuffle to include side nav