admin UI - work in progress
Merge remote-tracking branch 'rishabh/master'