add layout and others