working on reporting and fixed the admin page