Converted Add or Edit screen to Fragments. On a side note, management of Support Map Fragment is a right PITA with absolutely no documentation. :/