Updated for WaitScreen change and CSS renaming