Adding layout, converting setup steps