add helpers and fix some features in admin