Improve html and cleanup