more stuff. Now not flickering edit page stuff when loading