[FIX] Toggle Edit Mode Fixes
Merge pull request #99 from daleee/FIXES_edit-mode

[FIX] Toggle Edit Mode Fixes