Few changes in the layout