Fixed so all names on functions looks the same. Fixed so page type builder works on saved pages