Cleaned up the html, css and js are next