Fixed issues w/ admin panel and removed index in the admin.html
Fixed merge conflicts