Fix up layout, menu groups and add ids and names.