Fixing a stuck power button

Kids must have dropped it at some point and the aluminum button is stuck in the body and can't be pressed. I'm planning to open it up and take a look but wanted to check and see if anyone's been in this situation before.

1) I'm guessing the internal button assembly is OK and I'll just need to remove enough of the internals to pop out the metal outer button with a drift and file it to fit freely. Anyone have any experience?

2) I've read the guide and understand I heat the adhesive to remove the display. When I put the display back on do I need new adhesive, or will the old stuff still be in place and usable? Sorry if it's a silly question, the guides don't usually talk about reassembly.

Thanks!