Adding some layout features