added modal stuff
linked button
moved button event