Fixes on pages