Added html and cleaned up