part of layout and improving app structure