added on-tap event
added scroll