layout update

rough first update for layout