Small code refactor and added draft of edit in code/design view.