Fixed Edit Buttons

The edit buttons were overridden to enter/leave after being told to
leave. Could have added a break;/continue; but moved gamestate change
code to the end instead.