Rearrange silent keep/discard inventory offer buttons
Merge branch 'feat' into exp