modals a little cleaner, things are a little smaller
completed merge