started work on administrator page
Done merging admin page