Made a quick fix for modal issues, better solution pending rewrite