[C]Refactor of application layout to wrap admin layout
[G]