First pass at speeding up org pages