change layout, fix bugs