EDITING: Fix workspace layout

Fixes #516