Moved everything into one window, replaced the push button with a toolbar, other minor changes.