[#45333699, #44156007] Added pagination and moved things to partial