Restored most of the styling.
Better waiting flow.