Replaced grid code with upgrade. Started updating form.
Finished fixing all the format bugs with the new grid system.
Merge conflicts fixed