Some changes to the core layout