Fixed form bug and adding form to map view