Remove Close btn from popup; move add_button to top of file; update code comments