Good point. I suggest you fix the other issues first to get that code merged, then in a subsequent commit/PR you should move the MinimizeButton to its own pair of .h/.cpp files.