Add pagination, logout and oauth