#1 - fix admin pages