some changes in layout and all ok