titles and boxes formatting
Fixed merge conflict