small fix in pages and custom forms