Admin view rework and User ordering

@roblafeve Merge this in to get user ordering and stuff