#13 Back-end pages was improved