Move control options to the bottom
Fix der format
Regenerate and switch formats when necessary