fix style and add pagination views