[23] Menues replaced by Toggle
[23] Refactor
Merge branch '23-replace-org-draw-menues-with-buttons' into develop