fix bug and layout
update code