add layout and misc features