many bugfixes after changing app structure