[cosmetics] Minor layout changes