Improved buttons + new color