Numerous changes to the adminview
Add Customer working
Merge remote-tracking branch 'origin/dev-deam'