Merge pull request from easylogic/feat/multi Refactoring blank, design editor