fixing up subpage layout and code