#1 Revise spacing and messaging