Continued work on admin panel