Removed closing tags
Using new admin\Layout class for layouts
Merged changes