Save current CWD in layout Fix issue #23