updated ui, fixed list
Merge branch 'master' of https://github.com/dbarabander/intermeetiate