Fix padding issues
Fix form sort order