[refs #59] Improved design (cherry picked from commit 3147d4f)
[refs #59] Improved design
(cherry picked from commit 3147d4f)

tfroehlich82/koalixcrm,tfroehlich82/koalixcrm,Swappsco/koalixerp,Swappsco/koalixerp,tfroehlich82/koalixcrm,tfroehlich82/koalixcrm,Swappsco/koalixerp,Swappsco/koalixerp