new layout and lots  more