Change fetch logic
add tabs
Merge branch 'feature/tabs' into develop