Some changes to the main app structure