generalized whole code

added some nice demo-pictured and removed specific element-names,
-classes