Few Changes in layout