Rework waitingArea layout