#84 Edit and Draw is the same thing

Getting rid of duplicated stuff