Rearrange form elements for look
Remove deleted files