Corrected Wave and made small changes to the UI