Fix Host Page
merging final