UI
Merge pull request #49 from janinegallaron/master

UI modifications