Added further layout changes