update layout
fix merge conflicts