Refactoring and some treats!

- data-id and data-name now work properly
- data-on
- Finished Refactoring so the old horrible code is gone!

http://gfycat.com/GentleAllHoiho