Few changes in layout and functionality