fixed ordering bug, and admin page ordering