Fixes for Admin page