Add modal stuff back, fixes broken things in #10