added popups and navigation