lots of progress on modals and style tweaks