Code cleanup
Add position field to form