refactor html, make look and fill