Fixed ID/Class errors