check for id and cls properly
rebuild