Fixed IDs/Classes

Still learning