Merge create and update window to one