Trying to improve ui perforance