Popup fixes and tutorials implemented