Refactor extendClassName
button tweaks