Added some layout