some changes at the layout