Wait Time Updates based on Kristin Ng file

Made some updates and shifted some tags around so they look somewhat neater.