Tofe/work: Destroy window fix and minor esthetical changes