Clean up dart code, elements reflow