Code cleaning up
Fixes form rendering alignment issues per #1275