Clean up html + change color to happier