Admin improvements and bugfix in keuzes maken page