add packages, heavily customized (skip show view/go to edit instead, custom pagination on index, etc.)
fix merge conflicts from add-packages branch