Goal page refactor