Add Modal. Bugfixed.