Replace separator directive with UI Layout

Fixes #185