Improved buttons to reduce overloading.