Some changes on the layouts templates are made