more admin ui
improve admin ui again, also merge