fix states
improve edit button