doing some cleanup and adding navbar to all pages