Merge pull request #25 from ayshsandu/feature-store

Fix infinite scroll at store
update
refactoring after code review
Merge remote-tracking branch 'upstream/feature-store' into feature-store