Full picture crop + Popup redesign