Added layout to handle categories