Merge "Added UI for errors during layout and write." into klp-dev