fix image modals and add finishing touches