some improvements on admin view. Adapting client view