Added new layout in the code