Interim changes, working layout nearly complete