improved screening, added few admin buttons