tweaks to app structure