More responsive ui