Update feature: Minor fixes and better single form popup handling