Changes on layout template