Further attempts to improve queue rendering