Cleaned up scheduler and unified createedit form