Fix layout, add new sections