Improvements to the Tidy Button - Still buggy