More attempts to get this to work. Now reLayout'ing every load