Changed the architecture of the client from an MVC apporach to a Presentation Model (PM) respectively MVVM like.