[Organize] UI: 'Go back' and 'yes' button pushed down to outside of popup issue fixed.