Move modal toggle to layout to dry up some event handlers