demo update and layout fix
demo update and layout fix