Come cmake cleanups, added new class for close button.