Fixed admin pages layout
Merge