Rework the waitingArea layout