Clean up DB references and add user hover over to list item