added layout and variables