Minor fender updates to fix some issues.
Updating order of buttons based on feedback.
Merge pull request #517 from weerd/fender-updates

Fender updates