added more responsive features. fixed popups
updated my branch with will's changes