add pagination, re-arrange view