Added some layout changes