Minor Bug fixes with viewpager