Enhance Demo's Layout