Merged Lupe's update of Administrator Panel