Add YAML mode and move simple modes to same area