Added possibility of custom ordering in forms