Modifications based on Sheldon's feedback: Fixed primary and secondary nav behavior