Changed button bar

changed button bar back to one window to make it easier for movement