Gui 200

most of the items from Jenny's list in Jira