Some work on admin panel and other stuff