Added coords to the form and cleansed up a bit