UI images and Wavy resets

Wavy resets every time the mode switches to it

and imported some of Basheer's assets