fixed more issues with page calling