Fix layout
Added Minefield information
Merged
Diff tools didn't work
Don't forget the files