Re-organized html classes.