Added ImagePicker and ImageViewer