User show in admin and other fixes