Added container component and setup the file popup with the new components