gedit - update mockups to reflect recent discussions