integrated admin page
final touch
fixed conflicts