Add Html class and other changes