latest updates (almost finished with admin)