fix bad diff picking, remove back-button