Add tap on carousel, other fixes