part of the layout and some tiny change