Admin page

Merging admin_page into master