add var missing checks
removing of old todo's and reargement of the form location vars
Small Amount of styling added