fix db issue and popup view