Fixes for admin view