Use BRs in html model
Clean up dictionaries