page fix & functions fix