Bug fixing on pages 3,4,5