Update layout and add menu id