Commit some changes for Dynamic pages
Finish static pages