some changes to layout