Moved wait page
UI improvements