removed annoying scrolling & duplicate user issue