lots of aesthetic changes and better modal integration