Some work on admin section

Working on save query