pagination and ui tweak