add layout and the support for errors