Added admin view and cleaned up a bit