Final fixes to get page to render correctly