Added some changes to layout