BasicPages: Increment to 1.7 & Fix some bugs