Shai modified Admin UI