Changed app structure, added navigation