fixed pop up issue and some other bugs

Issues still exist with navigation.