Fixed settings pages
Improvements to custompages