made some changes to layout