Text / Preorder

Preorder button, text changes
Merge branch 'rr-calculatorcleanup'