Main scene fixes and more popups