Some improvements
All pages working