made some changes with the layout