Minor formatting/layout changes