Added api 2.0 support and fixed scrolling issues