Some changes to config and layouts