[BUG #8608] fixed theming page layout
[BUG #8560] minor fix