Cleaned up the waiting UI a bit.