minor improvements to layout and pagination