Modals and pic refactoring