layout changes and new modals
layout changes and new modals