Improve wait page