Removed obsolete script
Proper field names / reformat of layout
Reordered scripts
Added user data check
Proper field names