few more id/class updates