View Complete, edit complete, some form issues fixed, added map to the view