Minor layout improvement