finished UI website
Merge branch 'michael'