Added notifications and pagination
updated pagination