admin page working a bit better