changed class and id names to use underscores