app structure improved, feature 59, done together with Martin