Reworked buttons, scoped modal to only pop up in right place.