Show store remove buttons more; remove replace

Fixes #2527, #2529