changing submission popup, wasnt working properly, misc bug fixes