#159 + Queue page logic