cleaned up a little and added partials for page content