Improved Button Library