Button Enhancements

Thanks to "themadrobot"