Edit done and fix design