admin handler and page improved