moved and updated html