changes 

changes to both button visibility functions and navigation. incomplete