Reorder some options.
Fix odd bag button behaviour.