UI FIxes for pagination