Updating with oop structure.
Updating html with better structure.