Admin Panel Compelte and Drills Improvement

Please merge