Split Admin module definition
Merge master
Remove dupe layout and filter