Update ui
Merge branch 'master' of https://github.com/wesleycho/saam
Add missing files hopefully
Update