Viewpager layout improvments

Thanks @TheMrcool212