Enhacement

Include event handler and layout