add tags etc
better classes for better css selecting