Censeo_Page and Censeo_Options rendering updates
merge to test/options branch