Map in modal and a few bugfixes