Add some layout changes