Admin views finished
Mergin Bartek's changes