New Queue Layout design

#724