Changed some JS, HTML and CSS