more style fixes and more modals