Started to fix input boxes by adding spans after inputs

Not finished yet