Fix issue where preferences tab cannot be reopened after close all tabs option is clicked. #73
Fix merge conflicts.