Added option for display id seperately to display all and also cleaned
up the layout file