Made some changes in layout