Finish the html and angular part