adjusted class and id naming