Minor layout updates