Improved Admin and added data