Added layout changes