1st step of site-admin UI enhancement (HIVE-172)