Added classes, updated html