Limited paging depth, and added layout tweaks.