add layout and some other stuff