Tried to solve the offset in form (failed)

Kept the formatting changs, though