Structure updated

Changes on JS, HTML and CSS