Modified app structure, added expense plan