Improved Standards Compliance

* Removed duplicate IDs
* Removed bubble-[1-4]