Fixing some New page display path errors
Cleaning  the stuff up a bit