sidebar sort order (finally!)
merged page.php
Revert "changed number of rows in button text input field"

This reverts commit e812b09218909282b1236bb2f48c356a8372ca5d.
Revert "Revert "changed number of rows in button text input field""

This reverts commit 6e1537d051dab795837254855dc5cc63cf872155.