few layout template changes to adapt to the design