Few more refatoring in agenda and details, seriously need to refactor pagination logic