New app structure and added feature suggested by @lawnzapper