Viewpager layout improvments