Enabled export/import from file
Layout correction