updated HTML ids, removed data- attributes