multiple changes: drag and drop, better structure, templates and so on