Reduce layout ugliness