drastic chnages on app structure and layout