Minor layout adds