Minor layout adjust