Administrator: Complete all remaining layouts for J3.0
Merge pull request #1297 from mahagr/master

Administrator: Complete all remaining layouts for J3.0