Fix paging, Add view mode switcher.