HTML fixes and more pages