Some restructure of the UI for admin interface