added layout / partial functionality