improvments for admin application part