Updated button classes