Move workspace name wraps outside the names themselves

Add TwoPane and ThreeCol layouts for evaluation.