Added buttons for edit screen

and organized some commands