added some links, functionality for admin
fixed conflicts