Updated markup and js file