Tweaked the styles and UI to  prevent flicker on paging