split out includes, added front page panels