Fixed naming conventions
Fixed Two page combo area. However, there are currently unresolved
issues with page order randomly becoming wrong.