Improvement/57 update workspace layout