added layout and source