Merged and added the admin dashboard