added the main admin screen
Merge remote-tracking branch 'origin/master'