Added some layout options