[Jaws_Layout]: Fixed compatibility with admin side