Clean up UI. Add validation to data entry.