admin panel and minor fix