AdminDisplay preliminary and some fix