Added some changes in layout