fixed: static pages
Fixed some more logics