Edit option and pagination added