[Main] Added more popup code