UI Changes and pagination update