Finish and refactor HTML and CSS