Added Assets
UI Stuff
Merge branch 'Jesse' into Gani
Merged with Jesse branch. Fixed typos.