Bugfix

I solve some of the pages bugfix so no need to worry.