Add ui-layout and fix workspace