Add validator drawer
Merge