Refactor some code, add labels to input fields.