Fixing some errors and adding data attribute