pull form buttons right, improve maps field to be embedable