update in layout and some classes