Simplified toggling logic
Merge pull request #20 from kavi-fi/fix/admin-and-classification-editmode-toggling-fixes

Simplified toggling logic