Bugfix closemodal + functions names