Fixes, improvements and queue UI start