Fixed issues with preference window
LOW: Fixed issues with Window menu
LOW: Added missing final keyword