bug-fixing, layout update