progress n admin panel and some bug fix