layout and added grep