admin page fix
Merge remote-tracking branch 'origin/newdesign'